python resolve conflicts